From d193f667ea025803917d5bfe17b492612d1a1ee9 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 15 Sep 2010 07:48:27 +0100 Subject: [PATCH] x86: restore handling of "reboot=no" Somewhere between 3.2 and 3.3 this got dropped (as I noticed on a [rarely used] box that didn't crash on me since then). Signed-off-by: Jan Beulich --- xen/arch/x86/shutdown.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index dcaa79346b..7fa264125f 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -36,7 +36,7 @@ static long no_idt[2]; static int reboot_mode; /* - * reboot=b[ios] | t[riple] | k[bd] | [, [w]arm | [c]old] + * reboot=b[ios] | t[riple] | k[bd] | n[o] [, [w]arm | [c]old] * warm Don't set the cold reboot flag * cold Set the cold reboot flag * bios Reboot by jumping through the BIOS (only for X86_32) @@ -51,6 +51,9 @@ static void __init set_reboot_type(char *str) { switch ( *str ) { + case 'n': /* no reboot */ + opt_noreboot = 1; + break; case 'w': /* "warm" reboot (no memory testing etc) */ reboot_mode = 0x1234; break; -- 2.30.2